modified packages, fixed error in gitignore
merge