merge tweaks