don't cut off any of the image
updated build instructions
fixed conflict