Fixed sb_gps cmake and package files
Fixed merge conflicts