changes confliect

changes confliect