add linkedin to path
resolve conflicts
Merge branch 'master' of https://github.com/brianlin89/dotfiles
update