Hope this works
Merge remote-tracking branch 'origin/master'

Conflicts:
	Churn/.Rhistory
Merge remote-tracking branch 'origin/master'

Conflicts:
	Churn/.Rhistory