manually merge