Typo (renamed mamage_conflict in manage_conflict).