Conflicts resolved
reduce image size