fixed some images
fixed merge conflict in controller