Added custom multi select preference. Added an attribute used to select all the values for multi select preference.
Resolved merge conflict.