merge errors fixed