test merge conflict gccid1
gcc resolve conflict