resolve merge conflict in report