fix membership.php conflicts