changed dotfolio stuff
conflict resolved