merge
fixing merges
added oauth