add more changes
fix merge conflict