pull --rebase before starting the merge.
ignore my new mail folders
new aliases for stashes
update slate config