pop-up description
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 584
− 534
Files with large changes are collapsed by default.