fixed error on merge for enigma.php