really finished merging