rename merge to merge!