Optimized last pics
Fixed conflicts