Grunt plugin for preventing you from accidentally comitting a merge conflict into your project
btford/grunt-merge-conflict