merge remote and local master
remote+local