Add public system to gitignore
fix merge conflict gitignore