added osm bright
fix conflicts