Commented stop call after conflicts detected