Conflict solved

Signed-off-by: Michele Massari <michele@michelemassari.net>