removed file conflict tags missed by last merge
Merge branch 'smart-streets' into smart-streets-dev