You can follow the discussion on How to Find and Resolve Conflicted Files in Google Drive without leaving a comment. Cool, huh? Just enter your email address below, and you’re all set.