I\'m getting a linter error related to a file import. The error shows that there\'s a "<<<< HEAD" in the imported file from a merge conflict.. but I ha