git ignore.
merge.
tmux conf.