Solved conflit after a stash.
Solved conflit after a stash.

uclouvain/OSIS-Louvain,uclouvain/OSIS-Louvain,uclouvain/osis,uclouvain/osis,uclouvain/osis_louvain,uclouvain/osis,uclouvain/osis_louvain,uclouvain/osis_louvain,uclouvain/OSIS-Louvain,uclouvain/osis