Use "union" merge to automatically resolve trivial append merge conflicts from using ptl-tool.py. Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
