fixing callback merges across MR definitions