disable edit on git pull
Merge branch 'hotfix/0.13.4'