change the first as comment
merge dev origin/dev