fix merge in functions.php