merge w remote