all is merged now