Fix some merge issues