Fixed conflict detection on Google Drive
Fixed conflict detection on Google Drive