If your manager came back to you with a higher salary then it clearly means that you are valuable to the organization. Though your submission of resignation would have brought a bump, if you are valuable to the organization, there's a chance that you can have a good career there. If you have been one of the top performers then you might have higher chances of promotions too. And also, you have worked here for quite some time, so there's a trust factor between you and the organization. I suggest you continue working here.