resolved merge conflict
integrated flat ui into the asset pipeline
resolved merge conflict