Resolve conflict

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