fixin a merge conflict