Yes, you see the conflict in both merge and rebase strategies, but merging I find easier to deal with.  Suppose there is a conflict on a line that has been modified over several commits.  With merge, it is the state at the latest commit that you have to resolve.  With rebase, you have to resolve the conflict for every commit in your branch that modified that line.  In is much easier to resolve the conflict once rather than N times.