ticket:5 change image size
ticket:5 fix merge issues