added feeds
fixed some merge conflict nonsense