Adding hasDeps function
Fixed merge