resolved conflicts in .gitignore
resolved confilct