Added hover functionality
Fixed merges