Finished a merge that had conflicts.