try to fix the conflict