Removing file from failed merge