resolve merge conflict (2)