Adding merge conflict fixes