append feature5.2
delete conflict content