fix merge conflicts from dropbox sync.