Merge.
Update merge from local master.