handling conflict

Subscribe to handling conflict