Use goimports and merge history