updates
merge resolved in init.php