fast forward
update on server
merge master and server