Merge conflict issue

We have a release branch where all feature branches are merged, and for bug fixes, we create new branches from the release, fix the issue, and raise a PR to merge back. I created a new Dev branch from the release, made my changes, and raised a PR to the release branch, which showed a merge conflict. During conflict resolution, only two files had differences: one from my changes and another from someone else’s. I resolved the conflict, and since the PR was already approved, I merged it without noticing any differences in the diff. A new commit was created for the merge conflict, and everything seemed fine at the time. However, after my merge, several changes were made to the release branch by other developers. By resolving the conflict in my Dev branch, I unintentionally aligned the pointers of the release and dev branches, causing changes made after the creation of my dev branch to be lost. Now I can see the unintended impact of my conflict resolution, and some changes are missing from the release branch.