create custom indexes and disable auto generated custom index
deploy the new verion
resolve merge conflicts