Restarting after .git directory was lost
Still working on merge
Had to add some files for merge
Merge should have worked now