Rebuilt
Fixed a few git conflicts
Fixed a few more