init project
merger conflict gitignore