kinoshita feature-001 merge