Fixed spaces after merging