Update to latest, compile again, remove conflicting stuff.