got http proxying working
updated merge