thumbnail for afp
merged conflict