fixing conflicts
added more feeds