Fix a merging error

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