create repository
resolve conflict: both added .gitignore in remote/origin and local HEAD