Conflict resolve

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>