Hi,
You can use git merge. But which tree exactly are you using for the display kit? I think it is more likely that you need to enable certain config options for the display kit and that you need to make modifications to the devicetree file in order to support both the AXI-ADC as well as the display kit.
- Lars