merge remote changes