adjustments
fix merge conflict