Manual merge..