merge remote tracking