3-waymerge_test