register a new pull responder listener generates a new merge conflict in local scope

[CallmeT-ty]

This happens after removing an old one and adding a new one. Let's spend max 4 hours, if more sync again with the team