Resolve conflicting timestamps on channels