Handle conflict