fixade conflict