U are still confused.. m kinda surprised by this reply of yours. Well she herself is very confused wether to be with you or with him. she wants both the cupcakes to herself which is not possible. its very matured of you to forgive her and take her back in your life..seems you really love her. but ask yourself do u trust her. as you yourself say that you are confused wether to get married to her or not. so just clear your mind first. if possible meet her up and talk to her and clear your mind. because decision about is not a child’s play. decide and take a stand.
Hopefully you take a right decision. All the very best.
stay positive and keep smiling