working pusher code
fixed conflict