tweaks for merge