Changes for compatibility with rust
Changes for compatibility with rust
Fix merge conflict