Removed redundant comment in U2F docs
Fixed merge conflict