RFR - Changed sizing of photos

Only merge if the photos are screwed up after all the other merges. Regardless, this shouldn't screw anything up.