roll back the files
removing conflicts
resolving conflicts