removed conflict text