Fix spacing issues in Merge