deleted file from merge