Merge tool setup, done for now