Finish Merge formatting