basic oauth working
Resolved merging issue