Create _config.yml

Add _config.yml in order to help to get a better local building to test site generation.
Add "solve merge and rebase conflicts" place holder
Add introduction to merge and rebase article
Minor fixes in `solve-merge-and-rebase-conflicts.md`
Add merge section and screen-shots