Removing unresolved conflict files