conflict fix with merge

fixing merge conflict that caused error in testing