fixing changes
merging changes