add settings VC hookup
fix conflict