rebuild TimerSanityConflict screen into meaningful status
Merge pull request #186 from ims21/master

rebuild TimerSanityConflict screen into meaningful status