fix typo
resolve conflict