fix improperly-merged version