conflict typo fix