datesortfixed
controller merge