fix spaces in merge from zhangguoze/master to origin/master