test to resolve merge conflicts