rever styles
update oauth url
merge conflict