merging changes
fixed minor merge changes: