Add conflict behavior