keep master "green"

• disallow merge on test fail
• require at least one approval before merge
• fix errors introduced by ci/cd merge