Working version of merge!