wokrking easy
merge fix