fix extra conflict headers (remove)

Change-Id: Ic037e2f07db4146480396d5fce8e234972ec81b3