Parse and handle git merge conflicts well

[nickavv]

When using git, developers may run into merge conflicts. These are represented directly in code as such:

<<<<<<< HEAD
            // code from your branch
=======
            // code from merging-branch
>>>>>>> commit hash or description

In Eclipse the Java parser completely chokes on these extra lines and you get a sea of compile errors. My recommendation is that in Corona we parse the three merge conflict lines and make it visually obvious what is happening. To avoid errors related to part of the conflict referencing classes that don't exist or whatnot I recommend we not even bother trying to compile the code inside the merge chunks