remerging event.php