Using PHPStorm’s interface, I committed five files and pushed to github (I’m the only developer – I just use github as a sort of backup). Then I realized a little more cleanup was needed on one of the files, so I did that and then tried to do a commit amend with push. But it refused the push, saying there were conflicts I would need to merge. Huh? I tried to follow its instruction, saying that indeed my local file is what I want. Then I did a force push. I think it worked, but I now have an ugly bit in my branch log, with two versions of the same commit split apart and then merged. How can I get it to just be a single, normal commit instead?