commit guernz-2
merge conflit resolu