merge fix by hand