probably won't create a merge conflict