update content
fix merge conflict