remove packages from git and user defined settins
fixed merge