Find a format that can resolved in git conflicts

[GerkinDev]

The current file format of the timer is super light, and it's true that it can be a good point. But I often work on several branches, sometimes in parallel. In those conditions, I always end up with merge conflicts with the timer file, and I lose track of the real time spent on each branches.

Have you an idea to solve this issue ?

Cheers!