fix merge conflict leftovers