Merge fix

Merge errors reviewed and fixed.