Finished resolving conflicts