added things for conflict