merge remote then push