del dev branch and merge into master