remove merge conflict markers

Change-Id: Ia73602dcaeb26a7c30f7ab10ada3c689822614e0