just merge your work :)