Fixing some merge hiccups.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>