dumb mergetool

Change-Id: I3386083f3abc611b4b342627bab14c86bb6ae6a1