Fix merge problems
adding api routing to the main routing