fixed as commented
conflict fix