typo when fixing conflict

typo when fixing conflict