Gender Locking, Monster Banning, and Ending Changes
Fix sloppy merge

Signed-off-by: David Silver <dms.silver@gmail.com>