added builldings
Merged conflicts