errors after merge fix