Re-added SourceTree for diff/merge