post merge tweaks