merge remote master to branch