Finished resolving conflict.