Fix some merge conflicts