Delete file that was renamed but appeared again in merge