some updates
fix merge conflicts