remove cout << ...
fix test_vnc_client_simple
fix conflicts