Dumbed down git pull problems during merging (#4800)
Dumbed down git pull problems during merging (#4800)


jasp-stats/jasp-desktop,boutinb/jasp-desktop,jasp-stats/jasp-desktop,boutinb/jasp-desktop,jasp-stats/jasp-desktop,jasp-stats/jasp-desktop,boutinb/jasp-desktop,jasp-stats/jasp-desktop,boutinb/jasp-desktop,jasp-stats/jasp-desktop,boutinb/jasp-desktop,boutinb/jasp-desktop,jasp-stats/jasp-desktop,jasp-stats/jasp-desktop,boutinb/jasp-desktop,boutinb/jasp-desktop