Fixed some merge errors