fix line bug
Merge branch 'merge' into dev