solving bugs introduced by conflicts