Removed Conflict Text