Changed merge to use meld