fix: require conflicts

cc @MatthewMueller @stephenmathieson