Update look of map, delete comments, etc.
Resolve merge conflict