minor change
fix merge conflicts
fix merge conflicts
fixed first image bug