add js changes not checked in by authors
add merge articles feature, some steps
more steps in merge
most changes for merge done, except comments