Fix merge errors

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

Missing a crucial file

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

more fix

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