Finished previous conflict resolution.