Add Setting
Fix conflict