committing latest changes
merging fix