Fixing breaking merge