Fix merge conflict [fixes #31]

Fixes the merge conflict stated here: https://github.com/brianking/ReMo-Helper/pull/33#issuecomment-61622562