Merge "[Setting] Fix merge conflict"