Basically life is pain. I can\'t revert to a previous version because it conflicts with a commit that just randomly appears when I attempt to revert. Please help, I am in sh