merge pill-text
conflict res