Greetings Here is my personal opinion. I would do my best to put my stronger feelings on the shelf right now and allow the friendship to be healed. He is obviously attempting to be friends, at the very least. The idea that he seems to be flirting with you simply be his way of letting you know that he is still your friend, accepts the fact that you have feelings for him, and wants you to still feel comfortable being around him despite his previous rejection of you. He not know of any other way to help you feel better about the rejection other than to seemingly have a turnaroud. Friends often have some type of argument and falling out, and it is awkward for the bridge to be gapped. Good friends