added more content to doc
fixed merging issue