Mergeconflicts YET AGAIN

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Fixing merge conflicts

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>