merge method for \/
Merge pull request #580 from bmjames/either-merge

Either merge