cleaning merge conflict
updated .gitignore for conflicting reslove