Dep conflict resolution

Fixes the conflict issue from issue #41