DEVALGO-3425 - Resolve merge conflict between my kornakapi-php and plista