Long and lat added to companies
Fixed conflicts and long/lat