handle conflice