solving merge conflict in test class