Remove merge cruft

Change-Id: Ia68c711211025c47c523beaea280d6b5c09ca6c4
Signed-off-by: Evan Anderson <evan1124@gmail.com>

oops

Change-Id: If75bd7a1e8f103331e89a8c8de38de9bce43fa1d
Signed-off-by: Evan Anderson <evan1124@gmail.com>