sticky drawer shows master vc
merge add/sticky: resolve conflict