I just use intellij for merge conflicts
# random
d
I just use intellij for merge conflicts