update before pull
merge with origin master