small changes
fix merge conflicts