committing some changes for merge