minor
fix merge conflict