avoid IntelliJ errors
using new Jetty 9 server
bugfix merge conflict