I fixed it

Now I have what I wanted to commit, actually able to commit. Was having
problems with github wanting to sync three commits at the same time, all
with different stuff in it that kept conflicting with each other. You
can't change or remove past commits, so your just stuck there unless you
revert back to an older update.