deleted feed.xml
Resolve add/add conflict hopefully
resolve conflicts
build gh-pages
start over, again