merge remote & fs into this repo