fixup merge from branch