core: merging conflicts with overlapping times

[anglnn]

Closes #4921

[codecov]

Codecov Report

Merging #5110 (e38c189) into dev (6fc6ddb) will increase coverage by 0.02%.
Report is 9 commits behind head on dev.
The diff coverage is 90.47%.

@@             Coverage Diff              @@
##                dev    #5110      +/-   ##
============================================
+ Coverage     18.62%   18.64%   +0.02%     
  Complexity     2469     2469              
============================================
  Files           859      859              
  Lines        106439   106479      +40     
  Branches       2500     2513      +13     
============================================
+ Hits          19820    19856      +36     
- Misses        85252    85254       +2     
- Partials       1367     1369       +2     

Flag	Coverage Δ
core	79.23% <90.47%> (+0.03%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
.../src/main/java/fr/sncf/osrd/conflicts/Conflicts.kt	76.68% <90.47%> (+4.32%)	⬆️

[Khoyo]

As for the PR title (and the commit), I'd suggest core: merge conflicts with overlapping time

See our guidelines: https://osrd.fr/en/docs/guides/contribute/code/#git-commit-style

Keep the reference to the issue in the commit body or the body of the PR.

Additionally, if you add something like Closes #4921. in the body of the PR, github will auto close the issue when the PR is merged ;)