i think i've finished with merging