delete comment out
Merge remote-tracking branch 'remotes/origin/ver1.0'