Delete merge conflict files

Should have never been checked in