hopefully fixes a merge conflict