slight mod
fix merge conflict