resolved conflicts that results from sekiguchi pacth