Yes, most likely. Rebase hides the fact the 2 changes happened separately, a merge would make it much easier to see the different avenues that may lead to the bug.
We purposefully try not to do rebases in my team for this reason.
We purposefully try not to do rebases in my team for this reason.