flag changes
fix merge conflicts