Blame tests/resources/merge-resolve/conflicting.txt

Packit Service 20376f
this file is changed in master and branch