merged by hand