merging changes
trying to merge conflicts
updated the ignore file