+ pomodoro app
+ HG merge strategy