change settings configuration
commit after merge