fixing upcoming merge conflict