Conflicts: main.go Resolved conflicts with new merge
Everything is in the router folder in different file