newrelic stuff
added newrelic
fixed conflicts