merge is finally working!