main.Rd generated.
fixing trivial merge conflict

Merge remote-tracking branch 'swirldev/main_feature' into main_feature

Conflicts:
	man/main.Rd