Remove local settings from the repo
Do not merge via rebase