merging related changes