fix public conflicts by removing public from git