reorganize
fix merge conflict