Updates.
Fixes merge conflict, and adds go syntax highlighting.