first!
fixed merge conflict in git ignore file