merge by hand