update comment
fix merge
refactoring