fixing merge conflicts
missing comma