updating everything
merging diffs