adding teamName and merge conflicts