Reset after conflict test