moved merge to not protected