Merge Stopwatch to Master