Fix merge issue
Merge branch 'add-merge' into dev