fixing comma
merge conflict