just merge your work