Missed some merge conflicts