gitignore:change...this seems work well
.gitignore:some change, init.el:fix of visual, others:unknown
seems merge done?