I don't think you should have to install both versions one after the other. All of the changes Javelin made, are also in my build. We use the Master branch to build from. Maybe installing both is causing your problems?