.cabal file with merge conflicts triggers an error

[dniku]

Steps to reproduce:

1. Make a project versioned with git
2. Issue some git merge command that will cause merge conflicts
3. Open project in Intellij
4. On startup, you will see an error like this:

[global-stack-repl] Unable to parse cabal file /path/to/your/project.cabal: FromString "unrecognised field or section: \"<<<<<<< HEAD\"" (Just 16)

[rikvdkleij]

Thanks for reporting! I will fix it.