fixed conflict typo