I get dozens of conflicts when I do `git pull upstream master` Just the last few lines: 

```sh
CONFLICT (content): Merge conflict in examples/stats/plot_cluster_1samp_test_time_frequency.py
Auto-merging examples/preprocessing/plot_ica_from_epochs.py
CONFLICT (content): Merge conflict in examples/preprocessing/plot_ica_from_epochs.py
Removing examples/preprocessing/plot_eog_artifacts_from_ica.py
Removing examples/preprocessing/plot_ecg_artifacts_from_ica.py
Auto-merging examples/plot_topo_compare_conditions.py
CONFLICT (content): Merge conflict in examples/plot_topo_compare_conditions.py
Removing examples/plot_delayed_ssp_projector.py
Auto-merging examples/decoding/plot_decoding_spatio_temporal_source.py
CONFLICT (add/add): Merge conflict in examples/decoding/plot_decoding_spatio_temporal_source.py
Auto-merging examples/connectivity/plot_mne_inverse_psi_visual.py
CONFLICT (add/add): Merge conflict in examples/connectivity/plot_mne_inverse_psi_visual.py
Auto-merging doc/source/whats_new.rst
CONFLICT (content): Merge conflict in doc/source/whats_new.rst
Auto-merging doc/source/python_tutorial.rst
Auto-merging doc/source/python_reference.rst
Automatic merge failed; fix conflicts and then commit the result.

```