test merge in sourceTree