remove conflict markers from fr.yml

I must have made a mistake while rebasing !1061 (merged) and the conflict marker got in, sorry. Fixed and now everything builds fine.