Fix merge issue with fixed column headers