Continued merge fix