finished detail view controller base
fixed conflicts