Fix typo, conflict appeared