test if commit works on old tree
remove usersettings
Merge commit '227775242cca83d8c6a3f826d6dd5fc3299d2b59'