Cleaning up some merge conflicts