Fix some merge conflicts

-.-