How to solve a conflict with your friend ?
First,be calm and tell what happened and how you feel about it.
Second, share your feeling with out blaming the other person.
Third,listen to each other,respect his/her feeling.
Forth, take responsipilty for your action,ask what you can do to solve the problem.
Fifth,find a solution for you and your fried accept it.
If you try this steps ,write a comment ?