updates
fix merge conflict