Merge conflicts resolution.

Signed-off-by: Piment Noir Task Force <elecdev@piment-noir.org>