Fix conflicts

Signed-off-by: Lucas L <lucas@nuxbox.me>