Remove a file accidentally pulled during a merge.