resolved git conflicts in test file