fix dumb bug introduced in manual merge/edit