Fixed conflicts on css migrations