Configuring an upgraded Statamic site (from v2 to v3)

I'm working on getting a v2 site of Statamic up and running after migrating it using the CLI tool, but I'm running into a really confusing issue. I'm running it on a local version of XAMPP running Apache and I've set the APP_URL to what I have below. For some reason, when I go to load the site, it appends a lot to the URL, I'm not sure what's adding it. I don't currently have an .htaccess file setup, I'm trying to sort this issue out first.


When I enter localhost/eviance_v3 into a browser, this is the url that loads:

>>>>>>> Unanswered <<<<<<<
1 Reply
1 Follower