Merge branch 'master' of C:\Users\Bas\Documents\the-carbon-project with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\Bas\Documents\the-carbon-project with conflicts.
Merge remote-tracking branch 'origin/master'