> Preventing the merge problem in the first place is a much better approach than trying to fix it afterwards.

In a perfect world, all problems would be prevented. Unfortunately, we live in the real world, where being able to fix it afterwards is very important.