fixed conflicts
Conflicts:
	rhessys/cycle/patch_daily_F.c