creating feeds and seeds
fixed merge conflict with master