Added a authtoken
Fixed merge errors