Feature.root package

Fix merge conflict.