Moved the git root
Fixed merge conflicts