add merge-conflict functionality

on a conflict two separate headlines are added