some merge errors