Lets see if this fixes the crazy compass/gps issues with navigation
Fix merge conflicts