hooked up locations
resolved conflicts