repair aure's conflict.. --"