added variables to viewcontroller
resolved conflicts