reduced crashes by lowering dimensions of some photos
Hopefully, manually fixed merge