Fix merge conflict.

Fix RM 620 / RM 2222 Bypass; added additional tags to RM 620 / RM 2222 Bypass; Improve geometry and tagging of other nearby roadways and amenities.

Fixed top of round about; way alignment edits; added commercial area landuse; and started mapping out crosswalks.

Correct access tags on austin state hospital service ways (private -> destination); Mapped construction area of ASH; misc. alignment and other edits.

Fix typo in North San Gabriel Dam Name and added additional attributes

Roads and buildings

Mapped few buildings; improved road geometry and alignment; deleted non-existant roads; fixed waterway; etc.

Fixed misnamed river (wrong name intersects waterway, so assuming other mapper accidentally renamed more than they intended); mapped out missing parts of James river; lots and lots of road geometry alignment improvements.

Map more parking spots (using JOSM this time).

Map more parking spaces.

Way alignment and improved accuracy of parking lot micromapping.

Change road to prison to service road.

Additional alignment; and reclassify road to prison to minor. Open to discussing if folks disagree.

Fix alignment of ways at old Travis State Jail and School; reclass some roadways; added a few POIs; etc.

Map parking spaces.

Expand retail area; reclass parking lot related ways; other misc. edits.

Misc. fixes and additions; deleted non-existent roads; improved alignment of ways; etc.

Fixed hw classification for two segments (secondary_link -> secondary).

Construction update

Added bypasses on HW 71 (it is now channelized via bollards); misc. alignment improvements and other fixes.