Integrated instructor feeds
Resolved conflicts