Show git conflicts with priority

Show git conflicts in upstream directories with higher priority than other changes.

Previously git conflicts did not show at all in upstream directories.