what is the proper way to deal with sync conflict files? lets say i was able to resolve the conflict and updated the main file with the changes found in the conflict file. is it safe to delete the conflict file? is it safe to delete it from any device