added feeds fake model support
conflict fix