some fix
merge conflicts