commit to produce conflict
create conflict
Creating conflict msln
conflict MERGED
added gitignore file