conflicts fixed and SLICO

I've update the code from your repository and fixed some conflicts. Indeed, I've updated the code of SLIC, now it is SLICO.