Manual merge...