tweak for merge