adding a lot of stuff
merging head