Issue #208 resolve conflicts