add etherpad
add etherpad-lite
fix merge conflict