Merge home and work configs
merge
merge conflicts