Conflict solution works again