removed unnecessary packages
fixing merge conflicts