added conflict to feed