fix incomplete merge
process locations before individuals to satisfy dependency
update location form fields