adding merge conflict fixes