Combine all commits into one

Rewrites history to fix broken repo