Fix merge conflicts on src/lib.rs