Fixed sorting during time clashes
Merge branch 'fix-time-clash'