cleaning up an ugly merge conflict