fix conflicts

Author: giornetta

README.md

@@ -867,16 +867,13 @@ When executed, the command will:
 3. Automatically open the console in your default browser
 4. Attempt to connect for up to 35 seconds before timing out
 
-<<<<<<< HEAD
 ```sh
 # Check the status of a VNC/console session
 civo instance console status INSTANCE_ID/HOSTNAME
 
 # Stop an active VNC/console session
 civo instance console stop INSTANCE_ID/HOSTNAME
 ```
-=======
->>>>>>> a68ac1d (reset readme)
 
 ## Kubernetes clusters