commit file and update
merge dev on commit file and update