change of Merge
conflict solved