Got rid of pink cubes
Merge remote-tracking branch 'origin/master'