Added some base dependencies
merge conflict