save time on pause for now
Merge and resolve conflicts.