git ignoring
merging changes from mass_transport; only collided on .gitignore