merging now