Mid Version Control Resolve conflicts manually — look for markers like:? <<<<<<< HEAD Your changes ======= Incoming changes >>>>>>> main