Accidental merges due to glitchy interface

Other Merge Gardens issues: