Merge conflict fixes