merge fix

no jo, holt kdyz to po sobe clovek necte...