Manual merge with Miguel