Issue #182 Fixed merge conflicts again