What should i do in this situation?

Keep your good friend. You have no idea how long the girlfriend will be there, but friends typically stick by you. You should ask your girlfriend to compromise and tell her that the girl is your best friend and you have known her for the longest time. You want both of them in your life, but the other girl is not a threat to her at all.