Fix merge errors

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