Removed conflict text