Remove accidental merge marker

Change-Id: If98066c418f64be9f1bdce16558969d800e602c0