Merge conflict problem in UserTest