Updated to lastest Rust - Resolved conflict