Manual merge