fix bug 101
fix bug 101
remove 'add merge'
merge dev