added syntax highlighting to the readme
fixed merge conflict