REAL merge with buildings

attack tower is still in progress