made changes to interactive map
fixed conflicts