added road and pavement
merged conficts