I hate rerere. It never seems to work properly, misremembers conflict resolution and leaves bad conflicts without a warning. I turned it off.