include primary dependencies, view outline
fix merge conflict