ensured that GPSfixed is only reported if there is a 3D fix
fixed conflicts