minor adjustments on the merge