Manual merge with brach one