Removed residual conflicts in index.yaml