the script automatically consolidates the files when there are conflicts
Merge branch 'master' of ssh://github.com/mircealungu/PomodoroBox