Concepts Update

Hi all,

I have updated Concepts in accordance with my actions:
- ACTION-257
- ACTION-288
- ACTION-289
…and also found some issues in the document that had been resolved but not reelected.  I'm pretty happy with the state of my copy.

However, I now see that there are multiple heads on the document (using 'hg heads') and I cannot merge.  An attempt to use 'hg log' did not go well.  I could use some help.

Can someone give me a hand with the merge?  Thanks.

Regards,
Dave
--
http://about.me/david_wood