create conflict-master

Change-Id: Icb1d928d86d10d64de19d1ca427ab5f5023651ee
creating conflict -zd

Change-Id: I4c010e52b5d42b53b974281099b8addbbd65fb9f
conflict fixed by master

Change-Id: I06b3e80af93261ef3d04cfa71c3443b3fa77bac3
tree

Change-Id: I2cbd22d938dfe00424cf6fa09621a2185e7b5f99
change zg.txt when zd.txt is inconsistent with the remote

Change-Id: I3f80987fc5d8c3949125c8b1d8c514a842f90f6c
fix conflict

Change-Id: I9693042bd21375a9ec719aa4d0b103ec6f520b7a