corrections on yml comment by git merge.