merging any changes