merge remote after setting workspace