conflicts
normalize function replaced
public files