properly merge.