URGENT HELP ME PLEASE?

hi everyone remember me yes my previous ques answer paid off i tried and then i became his best friend and now its great eventhough i like him .the thing is now there is a new guy at school who is also my frnd he gets extremley jealose when we both r talking but i dont like the new guy like that then one day my love came and asked me to be his gf. HAPPY but then now he and i got into an argument we havent talked for 3 days wat do i do HELP ME plus the school prom is 2 weeks away i want it to perfect