initial tests for adding merge function (forgot to add file)
Merge branch 'master' of https://github.com/csmoseley/typo