Counter merge conflict on pull-request