test merge on banch testmerge add 'test merge' in line 1,2 test.c