merge fix

PR fixes