add Change 6
fix merge conflict