Problems in Riften

In my self quest of getting a house in riften, I hired a guy to fight with me. Long story short, we get back to riften after questing, he decides to fight a guard!! So the gaurds came and attacked me! All my previous auto saves took me back to when I was being attacked... finally I wait 48 hours in game and they allow me to serve my time in jail... that I didn't deserve...