merged oauth files from dev box