fixed merge conflict in test