Added palette dialog
Resolved merge