starting merging
finished merging