chnaged webrick config
fix merge conflix