merge resolve conflict client.php