merge conflict fixes
merge fixes