Fix issue #58
Resolve conflict