resolve conflict when merge PR52