added gitignore file
changes
repair conflict
fixes