create routes global change
conflicts solved
problems solved
'test' removed from urls
Other changes