merging changes
defining changes