Next iteration merging changes