more merge changes in classes/connection.php