add buildings
fix conflict