Based on the tension displayed here and there, I do not think its end is around the corner. It is still miles away.
The root of the problem is the perceived inequality, be it cultural history or admission outcomes. If there are no better solutions to the current problems, there will be support for AA from sections of the society. Conflicts? Yes, between the supporters and the opposition. Unless both sides agree upon a better solution, the status quo will be maintained.