update gitignore for settings
unindex config files
amend gitignore
resolved conflict after mergin master