Added coflict