small fix merge conflict