preempted what would have been major merge conflict. should be okay now