by Josef: conflict solved