merging things
missing a curly bracket