Cleanup after merge

delete merge conflict markers + bogus file