Add Go Sport & Conforama companies
Be sure to check if user is on /edit and /edit/
Switch back to old city fields