Remove file coming from a wrong merge