removed file from merge conflict