preparation aux conflits
Merge branch 'master' of https://github.com/IF-JAJAGA/linja-prolog