Removed ATL and Baltimore
Pretty Orange and Dates
Resolved Conflicts