Issue: #110 - Fix conflict