Implemented token-based authentication API base
merge failed