added and installed cocoon
fixing merge conflicts