Accidental merges due to close buttons

Other EverMerge issues: