added sentrygun picture with subimage
fixed merge errors