Add dotfile to each install
Fixed merge conflicts