resync include change, git config tweak