Removed user settings file from repo
update to more recent code from another branch