set the local custom.el
merge
add the gitignore
modify custom.el