Nantes Université
resolve all conflict
and #902 (closed)
and #896 (closed)
and #861 (closed)
and #883 (closed)