+ git log --oneline -n 5 5ec9884 conflict resolve e5c2713 master 644af33 new-release 7a2cd46 Merge branch 'new-release' into 'master' a1b641e conflict resolved