[Hours] [Activity] 2017/01/02 Monday 3.25 #122490 (sec) more merge conflicts 1.58 #122490 (sec) more merge conflicts, track down warning sources ===== 4.83 2017/01/03 Tuesday 2.47 #122490 (sec) track down warning sources, start merging test changes 1.95 #122490 (sec) more test merging, testing, debugging ===== 4.42 2017/01/04 Wednesday 3.05 #122490 (sec) debugging 1.52 #122490 (sec) debugging ===== 4.57 Which I calculate is 13.82 hours. I worked on a single security ticket this week.