delete confilct file
delete confilct file

ChoingHyun/iPhone2015,ChoingHyun/iPhone2015,125631/iPhone2015,lysongzi/iPhone2015,lysongzi/iPhone2015,blighli/iPhone2015,125631/iPhone2015,blighli/iPhone2015,ChoingHyun/iPhone2015,blighli/iPhone2015,blighli/iPhone2015,blighli/iPhone2015,125631/iPhone2015,blighli/iPhone2015,blighli/iPhone2015,lysongzi/iPhone2015