some merge errors fixed