merge errors fixing