lez go
fixed merge error