merging changes
taking changes