add the screenshot conflict parts