add Locations.xib
merge