First attempt to fix git meld