jinwoo confilct modified