removed skydrive conflict files