Manual merge complete