I think it depends on how you’re supposed to deal with each type of conflict. One thing is for different types of conflicts to exist, but if the method of dealing with them is always “you see a conflict, resolve it by flattening and recording it”, then they might as well be presented as the same.
If zombies should be handled differently, then they should also be presented differently.