fix countdown display
resolve conflicts
resolve conflicts