Resolve the conflict for the acctType.php