remove restclient and add seed_shops
fix merging issues