pusher works
pusher.com is now working
merge worked
fix merge