small fixes
merge conflict solved