Fixes #2
Resolving conflict