fix auction activation
Conflict fix