Attempt to get files in sysnc. This should fix merge conflicts.