Deleted fucked git repo and pushed again
Fixes
Merge conflicts fixed
Generate files