it wouldn't let me pull do now i do this
Merge remote-tracking branch 'origin/master'

Conflicts:
	DuelMajorRepo.userprefs