The best course is always communication. If this person is really your friend then communication is key. I have a friend who had this same issue many years ago. When they talked to their friend they both ended up feeling much better around each other. All three (the 2 girlfriends and the guy) ended up being very good friends.
Dosent always work out with the guy but friends will always be there for you.