Fix photo rotation problem and assign correct path
Fix conflict from mege