merge conflict fix nr 2