S56754 - resolve merge conflicts