small things to fix
merge conflict