Fix Related Changes

[jruesga]

Conflict-With is failing in 3.1

[jruesga]

The error is caused by is:mergeable not supported if index_mergeable is false which is a new feature to be released for 3.1.5 or 3.2. Only present in development environments, not in stable ones.