automatic merging of Go-related merge conflicts - View it on GitHub