merge
merge errors fixing