fix(merge): resolve dev conflicts for openclaw branch