there was a merge conflict marker that got in here somehow

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #529 from jonezy/master

there was a merge conflict marker that got in here somehow