Fix merge errors

Signed-off-by: Gabriel Reiser <gabriel.reiser@mybrighthouse.com>