Make photo library work on new dare VC
fix conflict