added git ignore file
first commit
fixed conflict