reverted change to no_conflict() which was causing crashes for multiplex sequences