stupid method, copied files instead of symbolic linking them
merge conflict in .gitconfig