Fix spacing issues for merge back