Resolve conflict. Improved use of scopes, removed unnecessary require.
Resolve conflict. Improved use of scopes, removed unnecessary require.

sirensolutions/sentinl,elasticfence/kaae,sirensolutions/sentinl,sirensolutions/sentinl,elasticfence/kaae