How do I sort this out and make things right?

Im a little confused, why did your friend say that you needed to stop? Stop what, being a friend? Anyhow, I think maybe your friend wants to try to make things work with his girlfriend, that is why he said for you to stop. He doesn't want you to think that you two are going to get together because he and his girlfriend broke up. I would suggest you wait a few days for him to cool off and then call him and tell him you only want to be his friend.