change interface of conflicts functions