continue merge and make it works

as title