Dropped a git conflict marker that snuck in

Change-Id: I56348f6ca3e7fb6f4e145f1cff7102704e806c63
Merge "Dropped a git conflict marker that snuck in"