merging w/ jetty