merging #2