commit guernz-2
merge conflit resolu
merge 2