File not cleaned after merge resolution!