Merge tweaks