grunt-merge-conflict (npm): Grunt plugin for preventing you from accidentally comitting a merge conflict into your project
Keywords: grunt|git|merge conflict