Fixed git merge errors and fixed naming errors
Fixed git merge errors and fixed naming errors

Heartbeat is considered one word, and should be capitalized like one.

Jonbeek/Sia,Jonbeek/Sia,emt13/Sia,emt13/Sia