Logical merge errors fixed manually Changelog-None Signed-off-by: Daniel D’Aquino <daniel@daquino.me>