Fixed conflict detection on Google Drive