removed duplicate dependency
merge conflict resolved