merge remote map_generator into local