Pushhhhhhhh
commiting for the second time because my image was not working in the previous version.
fixed conflicts