add a new line on the branch from master
conflict fixed