Resolve merge HH / KM