preference and billsettings form inserted
Merge conflict resolved