my first commit
conflict on gitignore after pull resolved