resolve merge + review