added a scrollview to the background of main view conontroller
conflict resolved