Finished resolving merge conflicts

I did it wrong the first time.