updates
fix merge errors