fix space & git merge formatting issue