Fix some merge errors