sdk: fix conflicts ann. docs

Change-Id: I9cb73b7b5c46cb19611b57425f70506f677f1fd5
Signed-off-by: Michael pasternak <mpastern@redhat.com>