Issue #131 - resolve conflicts