New achievement Architect (Level 4)
Fixed merge conflicts