space partition with buildings put along the roads
resolved conflicts, and merged files