initialize repository with gitignore
fix merge