made changes to map.css to work with conflicts