simplifying
merge fix