resolved welcome.php merge issue