finished merging, all routes work, both sign ups work