Bugfix: Stop resolving merge conflicts when unwipping

--------------------------------------------------------------------------------
Actions:
  Closes #10
Signed-off-by: Jeff Felchner <accounts+git@thekompanee.com>