gofmt tidyup.
Resolve conflicts.