Tried to fix my github branch, lost some things