Handle Feedjira error on feed create.
Resolve merge conflicts from pulling from origin master.