Removed a file leftover from a merge