Merge branch 'master' of /home/antoine/MiCorr with conflicts.
Merge remote-tracking branch 'origin/master'
Cleanup migrations...