doc: some words on Xilinx boards
doc: resolve merge conflict