merging new commits