added gitignore
adding vote
verify conflict