fix file edit
Merge branch 'new2' into dev