Github desktop merge master into branch