Deleted repo and started again
Fix merge conflicts