futher merge fix