some changes, unknown
merge fix