Jetty Merged (hopefully)