Remove conflict marker, fix whitespace

A recent commit introduced two commit markers and some whitespace.

Change-Id: I16ebf2ef167309ca6f3ad3f2343a8766d702df72