after merging changes