files merging, business settings fixed