merge documentation from facebook and fix conflicts