A fresh commit hoping to make the repo status more sane
Resolving all conflicts and beautifing the repo