Update trait_conflict_resolution.php