working on full merge.