2: some changes for conflict