Merge error

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