made a change on branch master
conflict solved