merge pierre & johan