Updated merge tool for SourceTree