Issue #414 solving conflicts