confliect resolved