modify to test merge tool