merge conflict stuff
Map and Hovers
 Mikey merge
merge conflicts updated
merge test