Jory Merge fix