let's try conflict

try how to merge conflicting file