Updated description in README file

Shows conflict creation and merge :anger: