Added JavaRuntime to Gemfile
Solve merge problems