merge conflict fixes