config_member.php
fixing merging error