#4: added merged mode on the view and corrected functional for merged mode in controller