handling conflict