merge avoidance
links
repairng pusher.js
master list changes integrated