Added ignore pattern for Dropbox conflicts.