jq: Rename conflicts filter to conflict & keep props [ci skip] (#1326)
jq: Rename conflicts filter to conflict & keep props [ci skip] (#1326)

- Singular, same as most of our filters
- Keeping only path/time is easy to do by hand
- Doing it by default sometimes makes the filter useless
cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop