fixed test case 44
fix conflicts