Initialize repository
Fix conflict of gitignore