save before merge
fixup for android