git merge failure on Repository.pm