adding everything
merging