merge conflicts
remove dup