testing merge tools
testing conflict
testing merge tool
testing mergtool add
making test changes