Attempted merge fix