Added the merge doc
Some cleanup