merge bracnh