resolve merge conflict
change height of imsges