merge diffs
add authentication notes