it is, but intellij used to hide these and just hi...
# random
p
it is, but intellij used to hide these and just highlight the conflicts instead