Removed merge conflict solver files pushed by someone else.