- Finished fixing merge conflicts

Signed-off-by: Stéphane Mons <st.mons.lists@free.fr>